From 539c6224a5854b769a77187acc1f5d6766fd77e0 Mon Sep 17 00:00:00 2001 From: "kaf24@localhost.localdomain" Date: Fri, 26 Jan 2007 16:46:00 +0000 Subject: [PATCH] [TCGBIOS] Fix some makefile issues. Signed-off-by: Stefan Berger --- tools/firmware/rombios/32bit/Makefile | 30 ++++++++----------- tools/firmware/rombios/32bit/tcgbios/Makefile | 4 ++- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile index f9a8f1bc9b..5028b77a7a 100644 --- a/tools/firmware/rombios/32bit/Makefile +++ b/tools/firmware/rombios/32bit/Makefile @@ -12,33 +12,29 @@ CFLAGS += -I../ SUBDIRS = tcgbios -MODULES := 32bitbios.o -MODULES += tcgbios/tcgbiosext.o -MODULES += util.o +MODULES = tcgbios/tcgbiosext.o -.PHONY: all subdirs +.PHONY: all subdirs clean subdirs: @for subdir in $(SUBDIRS); do \ $(MAKE) -C $$subdir all; \ done; -all: subdirs $(TARGET) +all: $(TARGET) -clean:: +clean: rm -rf *.o $(TARGET) @for subdir in $(SUBDIRS); do \ $(MAKE) -C $$subdir $@; \ done; -$(TARGET): 32bitbios_all.o $(SOURCES) - unref=`nm -u 32bitbios_all.o` - @if [ "$$unref" != "" ]; then \ - echo "There are unresolved symbols in the BIOS."; \ - echo $$unref ; \ - else \ - bash mkhex highbios_array 32bitbios_all.o > $(TARGET); \ - fi - -32bitbios_all.o: $(MODULES) - ld $(LDFLAGS_DIRECT) -r $(MODULES) -o 32bitbios_all.o +$(TARGET): subdirs 32bitbios.o util.o + ld $(LDFLAGS_DIRECT) -r 32bitbios.o $(MODULES) util.o -o 32bitbios_all.o + @nm 32bitbios_all.o | \ + grep -E -q '^ +U ' && { \ + echo "There are undefined symbols in the BIOS:"; \ + nm -u 32bitbios_all.o; \ + exit 11; \ + } || : + bash mkhex highbios_array 32bitbios_all.o > $@ diff --git a/tools/firmware/rombios/32bit/tcgbios/Makefile b/tools/firmware/rombios/32bit/tcgbios/Makefile index d29c278290..3c99ea4f7a 100644 --- a/tools/firmware/rombios/32bit/tcgbios/Makefile +++ b/tools/firmware/rombios/32bit/tcgbios/Makefile @@ -11,9 +11,11 @@ OBJECTS = $(foreach f,$(FILES),$(f).o) CFLAGS += -fno-builtin -O2 -msoft-float -nostdlib CFLAGS += -I../ -I../../ +.PHONY: all clean + all: $(TARGET) -clean:: +clean: rm -rf *.o $(TARGET) $(TARGET): $(OBJECTS) -- 2.30.2